Dirty first try
Some updates